g_output_stream_splice: check correctly the error code

While at it, change the style of other two occurrences.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

diff --git a/src/libostree/ostree-repo-static-delta-compilation.c b/src/libostree/ostree-repo-static-delta-compilation.c
index 51e5d1099c3a5d6892677baffbff64925aafd132..0563e86122d23580ab5499263d217b6820800c43 100644 (file)
--- a/src/libostree/ostree-repo-static-delta-compilation.c
+++ b/src/libostree/ostree-repo-static-delta-compilation.c
@@ -1344,10 +1344,13 @@ ostree_repo_static_delta_generate (OstreeRepo                   *self,
       part_payload_out = (GMemoryOutputStream*)g_memory_output_stream_new (NULL, 0, g_realloc, g_free);
       part_payload_compressor = (GConverterOutputStream*)g_converter_output_stream_new ((GOutputStream*)part_payload_out, compressor);
 
-      if (0 > g_output_stream_splice ((GOutputStream*)part_payload_compressor, part_payload_in,
-                                      G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET | G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
-                                      cancellable, error))
-        goto out;
+      {
+        gssize n_bytes_written = g_output_stream_splice ((GOutputStream*)part_payload_compressor, part_payload_in,
+                                                         G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET | G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
+                                                         cancellable, error);
+        if (n_bytes_written < 0)
+          goto out;
+      }
 
       /* FIXME - avoid duplicating memory here */
       delta_part = g_variant_new ("(y@ay)",

diff --git a/src/libostree/ostree-repo-static-delta-processing.c b/src/libostree/ostree-repo-static-delta-processing.c
index 9a9e69f90942dbb5e606a6caec6445fd9f55a65b..79c0a0ebe0a32f1fe6d7ae48e1a382e982390a16 100644 (file)
--- a/src/libostree/ostree-repo-static-delta-processing.c
+++ b/src/libostree/ostree-repo-static-delta-processing.c
@@ -294,11 +294,14 @@ decompress_all (GConverter   *converter,
   gs_unref_object GMemoryOutputStream *memout = (GMemoryOutputStream*)g_memory_output_stream_new (NULL, 0, g_realloc, g_free);
   gs_unref_object GInputStream *convin = g_converter_input_stream_new ((GInputStream*)memin, converter);
 
-  if (0 > g_output_stream_splice ((GOutputStream*)memout, convin,
-                                  G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE |
-                                  G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
-                                  cancellable, error))
-    goto out;
+  {
+    gssize n_bytes_written = g_output_stream_splice ((GOutputStream*)memout, convin,
+                                                     G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE |
+                                                     G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
+                                                     cancellable, error);
+      if (n_bytes_written < 0)
+        goto out;
+  }
 
   ret = TRUE;
   *out_uncompressed = g_memory_output_stream_steal_as_bytes (memout);

diff --git a/src/ostree/ot-builtin-cat.c b/src/ostree/ot-builtin-cat.c
index 721f992a1f74bfa7d1c648fce7cd4dde8a13236c..8eff545ec6aa790ed0f750a92bb00c4e8d97ffbb 100644 (file)
--- a/src/ostree/ot-builtin-cat.c
+++ b/src/ostree/ot-builtin-cat.c
@@ -46,9 +46,12 @@ cat_one_file (GFile         *f,
   if (!in)
     goto out;
 
-  if (!g_output_stream_splice (stdout_stream, in, G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
-                               cancellable, error))
-    goto out;
+  {
+    gssize n_bytes_written = g_output_stream_splice (stdout_stream, in, G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
+                                                     cancellable, error);
+    if (n_bytes_written < 0)
+      goto out;
+  }
 
   ret = TRUE;
  out: